A better fix for the previous error.