Issue #xxxx by tj, corrected automation errors