Fixed #1035