Remov workaround 8763