FIXES: #317 event delegation