Fix #17

Please, feel free to close #17 after merging this PR. This one should solve the problem.