Fix for double-comma problem