Merge "Fixing file writing bug"