Gem issue fix