Fixed 1.6.4 support