Bugfixed keys