Fixing #83.