Fixed #1821