Latest fix to js