Gems fix