MUCH better fix. Working great now!