Fixed #810