Work with either q 0.9 or 0.8