humm... is it the best way to fix this ? (a question only, I haven't look at the details but it looks like a hack to me)