Fix base view-model