Final fix for #901