dealing with issues: #2, #3