Work around 5.03b