Bugfix - remove breaks