integrate the fix for electron track