Now Atmosphere 2.1 and 2.2 work as expected