Make sure to also use optimized values