Maybe better solution.