First stage in fixing DASSERT error