I figured out a quick and dirty solution that should fix the problem for you, although I'll have figure out a proper implementation later on.
I'll upload the fix in a bit.