Add support for 1.6.2 and 1.6.4