Fix for new KeyList handling