fix double callbacks