Return code fix