return/exit fix