possible fix
Merge pull request #594 from teharrison/develop

possible fix