Fixed for page model change