Fix issue with spy