Fix for key updates