trying to fix what I broke :-(