moved callback point earlier to avoid Remote Resources conflict