Add a little bit better solution.