Changed break to goto