it's not pretty, but again I just wanted to keep moving parts to a minimum for this hotfix