fixed buffering, payload problem