Merging changes for security fix. Need to get actual root level instead of hardcoded -1.