fix controller issue