fix double start issues