tweak for WICKET-5411
tweak for WICKET-5411