fixing distribution support bugs