ticket:4

Fix errors.
ticket:4

Fix errors.