fix bug
Merge branch 'fix-bannedn' into develop