Fixed read & write (broken by 73b87033cc)