Solve all issues

All issue solve