Bugfixes

Minor bugfix