this is a self contained fix to the underlying iss...