A partial solution to the issue