Created attachment 424839 [details] Proposed fix They are referred to from -tool one. Please review attached patch and eventually apply it. Thanks!
Commited into CVS.