Fixed #1062