Fix mapping shell