giving up, hack works for now