Rebuild @ 1.6.0