resolve #2