Make it work on more hosts