Fix double-run bug for real