WICKET-1418

[Igor Vaynberg]

i attached a patch (untested) which solves it in a very general ways.
let me know if you guys see any problems with it.

-igor