VE-1178: Addressed minior JSCS issue