fixed controller issue