Redid patch of MAJOR bug and now is properly matched