Kh fixed service definition

#18 for 2.1 branch