Fixes #6470
Merge pull request #6473 from mwerezak/atmos

Fixes #6470