Attempt to prevent prod crashing.
v28