Fix for null key names