Fixed #1065