fixed intergration bugs