Fixed #1267