Fixed callbacks in barely used code path