Fixed #882.
Fixed #889.
Build