TRQ-2127 Put needed break back in and added curly braces to make it correct and for clarity.