Added missing breaks
Merge branch 'action'