Fixed issues in Ch8.