refactoring
improve handling no context takeover