Fixing #60