Make things even less ugly (?)