bugfix, add remote or local choice