fixed an issue with deferred and remapping