Fix timestamp issue when gen'ing fs (Issue #83)