Modify Fit Screen option to not require global context object