Fixing #121