fix on adoption