fixed issue with fast eval mode.