Fixed issue with gemlock