Fixed #1038