attempt bug fixes with 'artemk~'