fixed context determination
removed event parameter