Fixed #790
Second attempt at fixing #790
Merge branch 'master' into refactor