correction according to comments