Fix issue when this.Defer runs to late