Fix for alternative 'if' branch