fix some issues with eval