moar fix in js