Added 1.6.1 support