Fixed #1058