That did not work, so now copied modified files from Iocerra's repository.

Hope this works...