trying to fix the broken part