fix attempt #3654