Fix compatibility with CommandBook