Fixed a bug with the Data Manager