Added and Indexed 1.7.0 and 1.7.1 fix