Fixed for review comments.