Fix for chad's non-robust code. And updating compiled tool