Fixing #90