bugfix in unbuffer