fixing #54