Updated for latest bugfixes to full volume prediction.