Fixed #1900