FIX small optimization