Fixed bug in earlier merge.