Changes to fix the false positives and bugs.
This will create a new commit in order to revert the existing changes.
