Fixed false positive issue