fix some issue with data script