Work around bug upon first site visit