Forgot to mention that this fix was made possible thanks to invaluable help from TT (edy555).