Fixed issue with keylocality introduction