Update per comment by Druage.