Revert back to 16 so keys are displayed properly (bug #2240)