working on fixing #13