Fixing #97