Fixed #1768