begin work on fixing #32
finish testing this issue