Merge "Fix current.txt error"