Fix 3679

OK this is it finally :)