Fix drop-and-fork