Fixing #101