Fix for JS load