Fix bug:111