Enchantments fix

See #568