Fixed #1686