Does the new commit fix the issues in this thread? Just double checking, as I'm kinda lost in the comments here.