Fix callbacks not being disabled