Fix WPF handling
Add is-public function