Fixed #1790