#86: fixed event handler context