Squashed another HQP related bug!