Fixed issue with status & RETVAL