second fix attempt