Fixed #1059