Fixed compatibility issue with latest merge.