Fix for JS compat