WICKET-5187

This is a possible fix for WICKET-5187