I think this is the best solution I had for this very problematic issue.