Fix frame event emission