fixing #30