fixed returncodes