fixed DataMaster