fixed controller issues