Fixing JS concatentation