Debugging - replaced break with return