Corrected bug for linking.
There is no more the OPT variables passed to the linker.
Added another check for the variables