fix for Key change