fixing according new optical setup