Fix 595-47 (again)