Added remainder to reduce buffer loss