Fix assertion bug
Merge branch 'dev' into UI-ncurses