fixed #16 (again\! please take care with keeping this commit)