fixes more mapper bugs