Fixed #1033
Fixed #1034