fix service
merge fix from another branch