fixing #45