fixes for angie