Adding workaround for spring saml bug