Continuing the fix for AI-1 as a second commit