Final fix for #1726