Get rid of the localhost dependency - thx Jigal