Fix to #81