Fixed #1116