Fup of Commit 
f05c44d7719ea80718031c7a2c075e8c59478c6c
- more avoidance of double resolve
2 files changed