flyout hot fix for improvement