Issue #35 port fixes from original driver script

Issue #35
This changes add the workaround from the automate driver script.