Fix placement of DeleteSelf