Fixed #1626