better handling of O chunks