less ugly hack