Fix bug where xs2 was not being properly respected.