reverted small optimization