working on fixing #3