Fixed so writers get the correct return value