ViewController bug fix