Bugfixes

FIxed.