fixed the lucas`s bugs