fix bug and usage for having service definition in list (should not have that)