Fixed expression function to allow datasets to be evaluated