Fixing some issues with evaluating values