Fix for 5301