Fixed #919

Fixed #919