Fix to #108 public and relates to #107