Temporary fix for the agl-sota feature