Think I have a simple fix, testing it right now with some other changes. Should submit it later tonight.