dist hack around, still not right