Resolve #2