Merge pull request #931 from annando/fix-927