fix some mangled code
resolve helper merge