Fixed bugs with -think handling