Work on extended partition bugfix. I have not tested anything yet