Fixed #617
Merge pull request #657 from ehsteve/goes

Fixed #617