Changes made chasing an unknown serious bug