fixing firsts bug