Bug fixed in merge.