Added break and fix