Fixed #782