SSP-1614 Fixed extra commas, initial take