Fixed #17 (again)