Resolved an issue where context callback may be invalid for second call