Actually, I think ths is handled already - I will revert this bit of commit : there is some mismatch between what is in latest github and what is in my svn : probably artifact of when I last reviewed Matei's changes