more weird cases fixed