Fixed #1104