bug fix in code and opis