Fixed defer call