Fixed #1268