Fix strings

Fix #779