This should probably be `bufferId - 1`?