fix 1.6.4 mappings