Fixing dual mapper issue