Fix bug896933