RSS-222 - Issue 2