Final fix for #739