Fixed buffer by checking for existing ones and rebuilding over