Fixed #851