SW-148. Adding a break