Fix to single model data return