quick-disconnect bugfix (issue #320)