Fixed mapper issue