critical bug fix. bot may occur application crush.