Actually fixed the issue said to be fixed in the last commit.