fixed error after merging advanced mapping