resolve #1, resolve #2