Fix to writer