Bug fix for signature detection