Another try at solving the issue.