datalayer fix