1. Improve compability to support JB, 2. Fix issue caused by wrong library