Fix creating an Entry with Custom ID