Fix for [WICKET-5560]