Fixed #1269