Return codes still not working