Misspeculation fix and (more importantly) change to allow for the ev6 style