Fixed factonService ordering