Initial commit of my fix