Fixed for 1.4.7 (again)