fix js magic7
 after Merge