@lunaryorn I've pushed a new commit to this branch. Somewhat of a hack, but I don't have a better idea on how to solve it. You?