fixing #8