Fixed #848