fix. with mistakes