Bug fixed in next button of mapper