Fixed the last bug introduced by merging from branch based off of master.