alpha2 merge fix