Fix #889.
Merge pull request #890 from WalterHub/mymaster

Fix #889.