Another bugfix to fix the comma issue