I fixed the same problem in another branch.. didn't know also affected this branch.