Make compatible with new App Chooser