Fix Scrutinizer identified bug introduced by the attempted fix in a626e60c9185b9f1ffe031b695360965a989801e