Fix #330 (race condition)
Add strings for #204