[SB] small fix, needs further testing (see e-mail)
[SB] quick coding George did in my office