Fixed assumption of unique comment strings [1458]