i'm working on the branch now too, check if my changes cover your case :)