Fixed #1557