This is really a continuation of #2
The same code was actually cut and paste in two other places, so the same error occurred. I will do a PR that consolidates the model to DTO conversion into one function and incorporates the fix from #2 which will reduce duplicate bugs like this in the future.