Fixed #1523