SHQ bug 16922