Fixed #713