Fixed #1029