Is this change actually required here?