Changed lock handling