That might become a problem, but I think that this is better than before.

LGTM