Fixing #825