Bug fix: Disabling in callback was causing exception.