Bugfixes

Added a much needed break clause