QuickFix #46

Last of tonight.