AXS-664. Fix for when used in modal view controllers.