applied code review 'b46ec58a18435804de6fc9581617d8c56ce6ca78' and also fixed the bug of the DebugDrawer