fixed the Unbuffer class