Fixed #871