Fixed #1659