Fixed problem w/ most recent merge.