Fixed issue with cmd key