Fix to #75