handle detached character in more places
Merge branch 'detached-char-checks' into deploy