fixes #945 - event handlers always receive pre-adapted values