fixed datatools