Adding avoid conditions see BT#6369
Minor - changing key name