Updated bashbug proof