Initial callbacks were causing issues