Fix issue with enableddelayedexpansion