Fixing case, when self-evaluating functions were not processed properly