fix my previous mistakes