Fixed false positives on collision check
Fixed local variable renaming