Fixes #738 - turned out to be much easier than expected...
updating following fix #738
adding minimal help patch