1.6.3 Double Scan Issue Solved