Fix get-optimized