Add a temporary fix for the cross validation bug
Add the proper fix for the cross validation issue

This fix makes the cross validation quite a bit faster. The speedup
is proportional to the amount of parameters that are being cross
validated against.