Issue #539: fixed AiWander