Regression found when fixing ATMO-628 -- Addresses ATMO-640