Fix hanging up when browsing host for the second time
Merge commit '18b73bb3127caab87704f4af85fed3f3981c6f5e'
possible fix to #21