resolve dependency issue and bug