Code

Add code to fix bug #380501 in the future...