fixed unoptimized use of