GRAS-1461: added additional check