Fix order when implementing controllers