Fixed some 006->008 mapping duplication