More AI fixing