Fixed a bug that was failing the Data tests