Fixing problem from recent merge.