Try a better fix for bug AND-197