Fixed 'Site errors on some tenders' - issue #17