Fixed #650