Fixed #1260