syncing parallel fixes
merge fix