Okay if I understood you correctly, this should be corrected in my latest commit. After everything is ok I'll rebase this.