Fixing the previous bugfix.
Merge branch 'master' of github.com:CVC3/CVC4