Fixed accidental merge conflict -- shouldn't code late at night