More robust fix for 4709