Fixed #1261