Fixed code evaluation