Why did we need this change?