fix controller issues