Fix the previously introduced quality flaw