This is the fix for the hicckup