Fixed #1077