Fix bug
Fix "surrun"