Workaround for other changes