Fixed #14 (again)