Fixed problem with too many keys