fix: first attempt to fix  #19 and #16 and #17 at same time