Fix bug with comma's