fix underlying bug