Work-around for 31445