#43 Fix duplicate service bug