Fix away controller