Fix new entry creation