Fix for date inserted (can be null)