More strange case handling