BugFix: first , is not removed