Follow up issue after #695
Follow up issue after #695