fix workaround on service version