BUG FIX: break removed