#20 fixes