Address issue 32.