fix internal context issues when block gets executed