Fixed #1760