#108, #111 issues