Fixed #1577