fix #155
left behind a conflict
Merge pull request #168 from pioneerskies/yield_rename

fix #155