fixed crash from the datasource