#108 fixed