Merge pull request #1072 from ey6es/master

Another slight fix for circling.