Bug fix for client code sniffing