temp fix mapper's null input issue