Fixed wrapper length == 0 on delete