Added fallback support on customEvent