Changed according to comments.