Fix mistake where delegate was swapped too late