Added fix for automation code.