fix stop handling for descriptors