Fix Adit's changes