Closes issue #2590 We must found a less hacky way to handle this --HG-- branch : trunk
--HG-- branch : trunk