improve performance at load time
improve handling killed buffer