ViewAndModel mapping fixed