Fixed issue stemming from recent merge.