Added 1.6.2 Support