Bugfixes

Fixed #2