Fixed #864