partial fix of Iissue #68