Fallback hack -- duplicating code for both events