fixing bugs that were already fixed once!!!!