Issue #1 fixed. break added