Temp fix for evaluation, maybe fixed ordering by numbers issue