Fixed bug #222 (again)