This is ugly, do we really need it?