Minor (debug.assert added)