Fix Visibility Changed Handler