Fixed issues with breaks