Fix for as7

(cherry picked from commit 9e35631e6067cc8b453b1702bf4ef38f2cee733e)