Fix for v2 EVEN MORE. Dumb hacks. Blah.