Solve assets issue