Merge "Fixing error found by ioc."