fixed use with mapper bug