Fix entry creation