Fixed for previous core changes.