bug cir-7 should be now fixed
 cir-7 should be fixed