change from Edward Yang to fix warning