fixed js combining