hack to resolve 'remove' issue