Final 1.6 Fix