Fix accounting bug for mappers