Fix for smartbanner
(cherry picked from commit 61d10be)