Bug fix - incorrectly merged before.