hotfix for the performance regression caused by b0fcd9b2359ba6f1e49c2c06e9b371caf45571c8