Fixed #1130