Fixed minor inheritance bug. Modified both standalone and integrated-sta...

...tic versions.