Merge pull request #1022 from Diapolo/fix#1020