Fix bugs. The bug link Jira VPS-12.