attempt to fix weirdness