Fix JavaScript support [#37618]