More robust fix