Further fix in distribution module