fixes more mapper bugs
fixes more mapper bugs
fixes more mapper bugs