Fix it completely now