Fix 3679

OK this is is finally :)