Fixed compatibility w/ .8