fix issues: 25