Fixed the signature searching