ajaxian work for #6957
final work, fixes #6957