Fixed locking on wrong position