RSS-236 Issue 2