Changing control to prevent inf. loop.