made sure the return status is maintained