BUG fix for localhost