allows to run from localhost as well as forwarded link
fix merge conflict