Fixes the qualification side of issue #1522
Closes #1522