update condition checking on bounds
update condition checking on bounds
Merge branch 'bug/work-menu'
merge