Fix for a keys problem