Fixed #1295