 * Fix KeyFile bug #820