Added break where needed