Fised issue#647