Fixes #1 (again :)