Bugfixes

Fixed breaking bug