fixed gem and gemlock