Fixed system controller (really fixed this time)