Better comma handling