Bug fix, advanced testing set.