More cases for #4595