Fix according to comments.