Fix viewport issue

In any case, if a viewport has been specified, it *shall* be restored.