fstools: backport fix from master branch