Hotfix/service send overlap