trying to fix weirdness on branch