fix evaluation method