bug fix for q6 - correct