11/9 Fixed bug created by last commit.

Recall function caused problems. And trying to compact the code caused
another problem.