Fixed ReturnViewModel