Finally fixed spy