try and again to fix mapping