fix for ReturnCode | ErrorCode