AI: more work on previous fix, that last commit did not do the trick.