Fixed issues: 3,5