To Fix impact on JavaScript build in #847