bugfix after high-throughput testing