Fixed #870