Sjs/fix weirdness