fix debug msg
Merge branch 'eric' into dev