fixing #60