working on fixing #16