Bufix + performance improvement