#20262 Fix for js