Moved escape call to return statement again