Properly fixing what should have been fixed by commit #3086197