More consistent with the original