Version 1.0.2, add some check mechanism