fix js/cpp support