Fix Stanford (Closes #653)