Fix to #862