CFY 816 fix home directory guessing