resolve 'remainder' confliction