Second attempt to fix