Fix for 82804b1fa2