Fix for #770991
Merge pull request #12 from warp10/770991

Fix for #770991