Fixed incompatability with newest code.