Fixed function call and put back comparisons.