A step towards fixing #91