Bugfix fixing