F: fix performance