Fixed #1033