Move transfer unlocking to the flush