Fixed Spy class