fix #277 (inefficient code); update two strings