dansalvato/universal-controller-fix archive