bug fix service factory