re-adding comma support