Fix item remapping

This fixes the reported issue #36 . It also helps keeping blocks after future updates.