Same bug fix (this time at cleanup)
Merge branch 'respect-fellow-hs' into hidden-id