Fix for 5.12 failure.