Fix for KEYCLOAK-116