Should this have been added long ago, it seems unrelated?