Fixing global clobbering on 0.8