Fixed previous mistakes