Last time I looked at this I went "Too complex for lil ol me" - but now I think I've fixed it.

Thanks for the report and how specifically you included the commands and echoes, it helped!