Need to test this fix tomorrow.