Bugfix: Should fix #17