Fix to use current_host
IN PROGRESS