--fixed for RG-108