Only take out expansion lock when required