Fix leofs/issues/106 for v0.16.5