Fix some err, still not work