quickFix #442