I think this was alread fixed, and you just need to fetch the latest code before rebasing