Fixed comma and stop symbol crashes