Possibly fixed #738