make mapper safe