Fix for ATMO-618