Merge "Fix current.txt"