Fixed #878