Fixing sample content swap again