refactor the fix, just simply remove the timestamp