Double sent submission fix