Bugfixes

fixed.