fixes more mapper issues