#108 and #109