fix mapping checks