Fixed more scout behavior