Yes! I think that is a way to fix it for me, though remember that mine is a personal critique and not an objective truth, make this change only if you agree yourself ;)
